Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make tracked time representation display as hours (#33315) #33334

Merged
merged 3 commits into from
Jan 20, 2025
Merged

Make tracked time representation display as hours (#33315) #33334

merged 3 commits into from
Jan 20, 2025

Conversation

wxiaoguang
Copy link
Contributor

Try to backport #33315, the only trivial conflict is in the helper functions map in the helper.go

Fix #33333

Co-authored-by: Sysoev, Vladimir [email protected]

@vsysoev @wxiaoguang
Make tracked time representation display as hours (go-gitea#33315)
09f6c74 
Estimated time represented in hours it might be convenient to
have tracked time represented in the same way to be compared and
managed.

---------

Co-authored-by: Sysoev, Vladimir <[email protected]>
Co-authored-by: wxiaoguang <[email protected]>
# Conflicts:
#	modules/templates/helper.go
@GiteaBot GiteaBot added this to the 1.23.2 milestone Jan 20, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 20, 2025
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 20, 2025
@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/frontend labels Jan 20, 2025
@wxiaoguang wxiaoguang mentioned this pull request Jan 20, 2025
Closed
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 20, 2025
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 20, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 20, 2025
@lunny lunny merged commit eef6355 into go-gitea:release/v1.23 Jan 20, 2025
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 20, 2025
@wxiaoguang wxiaoguang deleted the backport-sec2time branch January 21, 2025 00:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@silverwind silverwind silverwind approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/frontend modifies/go Pull requests that update Go code size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
1.23.2
Development

Successfully merging this pull request may close these issues.
5 participants
@wxiaoguang @lunny @silverwind @GiteaBot @vsysoev